From 44404f2dc8f708e2bc703c8ce980924cb7c10290 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=B8ren=20Sandmann?= Date: Mon, 4 Apr 2005 16:20:28 +0000 Subject: [PATCH] Translate x, y into widget coordinates instead of root coordinates. Patch MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Mon Apr 4 12:14:35 2005 Søren Sandmann * gtk/gtkmenu.c (gtk_menu_handle_scrolling): Translate x, y into widget coordinates instead of root coordinates. Patch from Jorn Baayen. (#172236) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkmenu.c | 5 +++-- 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d896307eee..ae42fddf15 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Apr 4 12:14:35 2005 Søren Sandmann + + * gtk/gtkmenu.c (gtk_menu_handle_scrolling): Translate x, y into + widget coordinates instead of root coordinates. Patch from Jorn + Baayen. (#172236) + 2005-04-04 Matthias Clasen * gtk/gtktoolbar.c: Add a tooltips property. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index d896307eee..ae42fddf15 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Mon Apr 4 12:14:35 2005 Søren Sandmann + + * gtk/gtkmenu.c (gtk_menu_handle_scrolling): Translate x, y into + widget coordinates instead of root coordinates. Patch from Jorn + Baayen. (#172236) + 2005-04-04 Matthias Clasen * gtk/gtktoolbar.c: Add a tooltips property. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index d896307eee..ae42fddf15 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Mon Apr 4 12:14:35 2005 Søren Sandmann + + * gtk/gtkmenu.c (gtk_menu_handle_scrolling): Translate x, y into + widget coordinates instead of root coordinates. Patch from Jorn + Baayen. (#172236) + 2005-04-04 Matthias Clasen * gtk/gtktoolbar.c: Add a tooltips property. diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index 2dfa0c22af..38c950ad48 100644 --- a/gtk/gtkmenu.c +++ b/gtk/gtkmenu.c @@ -2954,9 +2954,10 @@ gtk_menu_handle_scrolling (GtkMenu *menu, GTK_WIDGET (menu)->style->ythickness + vertical_padding; gdk_window_get_position (menu->toplevel->window, &top_x, &top_y); + x -= top_x; + y -= top_y; + gdk_window_get_position (GTK_WIDGET (menu)->window, &win_x, &win_y); - win_x += top_x; - win_y += top_y; if (menu->upper_arrow_visible && !menu->tearoff_active) { -- 2.30.2